Merge "Fix allowlist token issues" into sc-dev am: ce91b479d7

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

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