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

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

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