Merge "Turn flag back to default on" into udc-dev am: 83566315 am: ba7654d9

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



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