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

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



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