Merge "Merge "Fix touch on QQS tiles" into tm-dev am: eae3e16a am: 3f4cbe61" into tm-d1-dev-plus-aosp am: 690117d0

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



Change-Id: Ib32a6f2c9f0a56c62f44cf0695dd3084069fccb5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>