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

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



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