Merge "Replace "whitelisted" with "allowed"" into main am: 7f01eaea35 am: e3ffd26b14

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

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