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