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

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



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