Merge "Revert "Revert "Enable ADVANCED_VPN_ENABLED For Droidfood""" into udc-dev am: 0889a133 am: 41d441f2

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



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