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 am: d1539100

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



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