Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae am: 1d3e694b97

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

Change-Id: I6b4bb71859b54fde6a857680e880e3f389b20c74