Merge "Fix allowlist token issues" into udc-dev am: ef34c77bbc

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

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