Merge changes I886a7277,I25d96c82

* changes:
  Move development test package to sdk 26
  Move OemUnlockPreferenceControllerTest to sdk 26

src/com/android/settings/development/OemUnlockPreferenceController.java

@@ -98,7 +98,7 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
     @Override
     public void updateState(Preference preference) {
         super.updateState(preference);
-        mPreference.setChecked(mOemLockManager.isOemUnlockAllowed());
+        mPreference.setChecked(isOemUnlockedAllowed());
         updateOemUnlockSettingDescription();
         // Showing mEnableOemUnlock preference as device has persistent data block.
         mPreference.setDisabledByAdmin(null);
@@ -183,7 +183,8 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
     /**
      * Returns {@code true} if the bootloader has been unlocked. Otherwise, returns {code false}.
      */
-    private boolean isBootloaderUnlocked() {
+    @VisibleForTesting
+    boolean isBootloaderUnlocked() {
         return mOemLockManager.isDeviceOemUnlocked();
     }
 
@@ -216,4 +217,9 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
                 userHandle);
     }
 
+    @VisibleForTesting
+    boolean isOemUnlockedAllowed() {
+        return mOemLockManager.isOemUnlockAllowed();
+    }
+
 }