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

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



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