Merge "Cleanup: rename loadDeviceOwner() to loadOwners()"

diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 6d7343d,76ef860..8691568
--- 1/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
--- 2/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@@ -1778,19 -1780,8 +1778,19 @@@ public class DevicePolicyManagerServic
          if (!mHasFeature) {
              return;
          }
 +        switch (phase) {
 +            case SystemService.PHASE_LOCK_SETTINGS_READY:
 +                onLockSettingsReady();
 +                break;
 +            case SystemService.PHASE_BOOT_COMPLETED:
 +                ensureDeviceOwnerUserStarted(); // TODO Consider better place to do this.
 +                break;
 +        }
 +    }
 +
 +    private void onLockSettingsReady() {
          getUserData(UserHandle.USER_OWNER);
-         loadDeviceOwner();
+         loadOwners();
          cleanUpOldUsers();
          // Register an observer for watching for user setup complete.
          new SetupContentObserver(mHandler).register(mContext.getContentResolver());