[automerger skipped] Merge "Do not let QS handle touches where clipped." into sc-dev am: ba10bacbce -s ours am: 3c46b8c1ad -s ours

am skip reason: Merged-In Ie264ee69570f72f5653b423a8649663e3aab1df9 with SHA-1 dab0ff498b is already in history

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

Change-Id: I04bd6ae39d1e4cfb3d4a42f6a7e30c70d52e6f5e