Merge "Fix device admin access with permission checks." into udc-dev am: cea6724a1d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22322075

Change-Id: Ia604dea772a6b67ad92384a9bc0917b2fe7e9064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/app/admin/DevicePolicyManager.java

@@ -6413,7 +6413,7 @@ public class DevicePolicyManager {
     public void lockNow(@LockNowFlag int flags) {
         if (mService != null) {
             try {
-                mService.lockNow(flags, mParentInstance);
+                mService.lockNow(flags, mContext.getPackageName(), mParentInstance);
             } catch (RemoteException e) {
                 throw e.rethrowFromSystemServer();
             }

core/java/android/app/admin/IDevicePolicyManager.aidl

@@ -119,7 +119,7 @@ interface IDevicePolicyManager {
     void setRequiredStrongAuthTimeout(in ComponentName who, String callerPackageName, long timeMs, boolean parent);
     long getRequiredStrongAuthTimeout(in ComponentName who, int userId, boolean parent);
 
-    void lockNow(int flags, boolean parent);
+    void lockNow(int flags, String callerPackageName, boolean parent);
 
     /**
     * @param factoryReset only applicable when `targetSdk >= U`, either tries to factoryReset/fail or removeUser/fail otherwise