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: aca737f5

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



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