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

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



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