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: 36aa6a4b am: eb0fdaf9

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



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