[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-qpr-dev am: 326af904 -s ours am: 385e8c8b -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/+/19302228



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