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

[automerger skipped] Merge "Fix allowlist token issues" into udc-dev am: ef34c77b am: 6415ae7d -s ours am: 35180e85 -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 966c7f2d is already in history

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



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