Merge "Add feature flag for advanced vpn" into tm-qpr-dev am: e8a0ffc8 am:...

Merge "Add feature flag for advanced vpn" into tm-qpr-dev am: e8a0ffc8 am: 4e622a83 am: b78e4b54 am: ce005019

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



Change-Id: If6306b616f474aae8d851459c80922d7696d8674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>