Merge "Perform the user-allowlist check after all other fixed allowlist check"...

Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev am: 6d33a7c7

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



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