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

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

Change-Id: I5725049a13c30e122e1f8b5e4e772b7431a4e32d