Merge "Revert "Revert "Revert "Revert "Enable ADVANCED_VPN_ENABLED For...

Merge "Revert "Revert "Revert "Revert "Enable ADVANCED_VPN_ENABLED For Droidfood""""" into udc-dev am: d1668371 am: b9d59ad4 am: c8bb32d6

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



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