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

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

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