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

am skip reason: Merged-In Id02a37624655c4ff88744c9c57af9f2a17953667 with SHA-1 572d2ec8 is already in history

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

Change-Id: I8ba9a579111edcf592caaa4d0339d5e789c8c3e9