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

[automerger skipped] Merge "Fix allowlist token issues" into tm-dev am: e09da15e am: c50ae70f -s ours am: 4718b121 -s ours am: 7f590869 -s ours am: 56d0cfd8 -s ours am: 5010ad09 -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: I9c965a48c3f061a0c94e5941ced2dc51f4f5ee27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>