Merge "Revert "Enable ADVANCED_VPN_ENABLED For Droidfood"" into udc-dev am: 272ee645

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



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