resolve merge conflicts of 718f321 to nyc-mr1-dev

Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5

diff --cc api/system-current.txt
Simple merge

diff --cc core/res/AndroidManifest.xml
Simple merge

diff --cc services/core/java/com/android/server/PersistentDataBlockService.java
index 51037dd,680547a..1e0b693
--- 1/services/core/java/com/android/server/PersistentDataBlockService.java
--- 2/services/core/java/com/android/server/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/PersistentDataBlockService.java
@@@ -452,18 -452,9 +462,18 @@@ public class PersistentDataBlockServic
              if (ActivityManager.isUserAMonkey()) {
                  return;
              }
-             enforceOemUnlockPermission();
 +
+             enforceOemUnlockWritePermission();
              enforceIsAdmin();
  
 +            // Do not allow oem unlock modification if it has been disallowed.
 +            if (Settings.Global.getInt(getContext().getContentResolver(),
 +                    Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 1) {
 +                throw new SecurityException("OEM unlock has been disallowed.");
 +            }
 +            if (enabled) {
 +                enforceFactoryResetAllowed();
 +            }
              synchronized (mLock) {
                  doSetOemUnlockEnabledLocked(enabled);
                  computeAndWriteDigestLocked();