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

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



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