[automerger skipped] Merge "Merge "Perform the user-allowlist check after all...

[automerger skipped] Merge "Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev am: 6d33a7c7 am: d1539100" into tm-d1-dev-plus-aosp am: f990d127 -s ours am: eee1696d -s ours

am skip reason: Merged-In I5beb161f46172d518f54f8e99f682116083a6ca4 with SHA-1 26945bf8 is already in history

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



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