[automerger skipped] Fix allowlist token issues am: 46aafeb8 -s ours am:...

[automerger skipped] Fix allowlist token issues am: 46aafeb8 -s ours am: 7189218e -s ours am: fedbfa3f -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 697c31d7 is already in history

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



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