Merge "Removing enforcePermissionsAndGetEnforcingAdmin from ...

Merge "Removing enforcePermissionsAndGetEnforcingAdmin from  cleanCallingIdentity block" into udc-dev am: c831c399 am: a4b334cf

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



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