[automerger skipped] Merge "Fix allowlist token issues" into sc-dev am:...

[automerger skipped] Merge "Fix allowlist token issues" into sc-dev am: ce91b479 am: 48399654 -s ours am: b4a1eaab -s ours am: 02fc106b -s ours am: 8fc7c001 -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 5d107bcd is already in history

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



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