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

[automerger skipped] Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev am: 6d33a7c7 am: 36aa6a4b am: 8ca85608 -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: I1bdba96da78193233ae10a802e0cbbcf66a8e61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>