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

[automerger skipped] Merge "Fix allowlist token issues" into tm-qpr-dev am: e76ce5bc -s ours am: 17f631d2 -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: I9bc0d045fea104a610ed9cd6fd3b26ce6be9d1e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>