[automerger skipped] [conflict] Merge "Fix allowlist token issues" into...

[automerger skipped] [conflict] Merge "Fix allowlist token issues" into udc-dev am: ef34c77b am: 40725b15 -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 61274fc6 is already in history

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



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