Merge "Revert "Revert "Turn on customization flags for dogfood""" into udc-dev am: 9184971e am: a41743ee

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



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