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

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

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