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

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

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



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