Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: 4cfe6d8f57 am: 711ce9c728

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If935ced9f977749e1ce4d86fe74d186f5efcd896