Merge "Merge "Fix the multi-fingers gesture conflict with TouchExplorer" into...

Merge "Merge "Fix the multi-fingers gesture conflict with TouchExplorer" into rvc-dev am: 18905eb6 am: 3bbed462 am: b4516929" into rvc-qpr-dev-plus-aosp am: 60fe3d52

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

Change-Id: I4347e8e806a108cefbdeded0299ab11b8d772eb2