Merge "Merge "Fix the multi-fingers gesture conflict with TouchExplorer" into rvc-dev am: 18905eb623 am: 3bbed462b9" into rvc-d1-dev-plus-aosp am: f5e64866ab am: 6b870993f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953898 Change-Id: I0fe1c47c73e9ec42ac5a3e68dbd6348b9379c6e6
This commit is contained in: