Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e

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

Change-Id: Ifd5f2a31ba5d3fbe9aaedca7b4c83d665cc61b9f