[automerger skipped] Merge "Replace 'whitelist' with 'allowlist'" am:...

[automerger skipped] Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c am: 3563eeb4 am: 1d3e694b am: e022945d am: bc938819 -s ours

am skip reason: Change-Id I94a43c1c995052b034d8a5377786e1a15e4c9c59 with SHA-1 0d3caed7 is in history

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

Change-Id: Ic7b5df8b6102f2738c5e0f34a22efd20e7fc5958