Merge "Revert "Revert "Revert "Enable ADVANCED_VPN_ENABLED For Droidfood"""" into udc-dev am: 29491469 am: cd189544

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



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