[conflict] Merge "Fix allowlist token issues" into udc-dev am: ef34c77b

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



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