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

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



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