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: 6b95b020 am: 519bb045

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



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