Merge "Make device wide DO features available if all users affiliated"

diff --cc core/java/android/app/admin/DeviceAdminReceiver.java
Simple merge

diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
Simple merge