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

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



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