Merge "Restrict Carrier Wifi while VCN is configured & privileged" am: c84bc1f13c am: ddc40b5ce2 am: cf9c5b0943

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5c0137511309a1b1a5498dc702da7a8b20af3e4