Merge "Restrict Carrier Wifi while VCN is configured & privileged" am: c84bc1f1 am: ddc40b5c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb5858838d6b83ea60880649b53cbb3d78e4df4e