Merge "Fix touch on QQS tiles" into tm-dev am: eae3e16a am: e7fa3c58 am: 7a3aae1c

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



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