Merge "Fix the multi-fingers gesture conflict with TouchExplorer" into rvc-dev am: 18905eb623

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

Change-Id: I6d23efcab20bf5c1d23dc7699fe478ebb3ef600e