[automerger skipped] Fix allowlist token issues am: 5d107bcd -s ours am: f0157c59 -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: I71fab4e1b84431c6e1d5550adcd980c108c99485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>