[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am:...

[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac am: 8cec61d8 am: b79cddd6 -s ours am: 96551cdc -s ours

am skip reason: Change-Id Id02a37624655c4ff88744c9c57af9f2a17953667 with SHA-1 572d2ec8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib59426962232c26855c50e074606de14af8419e8