[automerger skipped] Merge "Removing enforcePermissionsAndGetEnforcingAdmin...

[automerger skipped] Merge "Removing enforcePermissionsAndGetEnforcingAdmin from  cleanCallingIdentity block" into udc-dev am: c831c399 am: a4b334cf am: 219d21d8 -s ours

am skip reason: Merged-In Iae54d93f4ba08657f5d7d466cfa8e02bfa6c5809 with SHA-1 9d85929a is already in history

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



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