[automerger skipped] Fix allowlist token issues am: 46aafeb8 -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: If2eea32d60d1cebea9f3b71f3367ea0bf7a3d608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>