Merge "Revert "Turn on customization flags for dogfood"" into udc-dev am: 0effc891 am: c16c18b3

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



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