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

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



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