[automerger skipped] Merge "Do not let QS handle touches where clipped." into sc-dev am: ba10bacb am: 64bb3f3c -s ours

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

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

Change-Id: I021d92e5a430c475d967eccb2c4b1bf7f53dba25