[automerger skipped] Merge "Fix allowlist token issues" into udc-qpr-dev am: e90ea77f -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 4426de38 is already in history

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



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