Merge "Turn flag off here because there is a bug" into tm-qpr-dev am: 4773e223 am: fc707f2d am: aa0ac6d5 am: 5b9f7efb

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



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