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

[automerger skipped] Merge "Fix allowlist token issues" into tm-dev am: e09da15e am: 27f6bbca -s ours am: bf7e23b0 -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 46aafeb8 is already in history

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



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