Merge "Fix allowlist token issues" into tm-dev am: e09da15e1e

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

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