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

[automerger skipped] Merge "Fix allowlist token issues" into sc-v2-dev am: 34984a2e -s ours am: f9b6db53 -s ours am: 76570b43 -s ours am: 8226b029 -s ours am: 6f53ee55 -s ours am: 11efc8ff -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 61274fc6 is already in history

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



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