[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 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: Ib3e28f4e6d5b4e3b783ba1babf4bb7a0947f9f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>