Merge "Make touchXOutsideOfQs require split shade to be enabled" into tm-qpr-dev am: 6e8b02c2

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



Change-Id: I258acbf5de23de792a1f1df54eb1ce6b7bcf67b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>