Merge "Merge "Fix Hard to detect multi-finger multi-tap" into rvc-dev am: d531e285 am: f84eb3dd am: 90e24630" into rvc-qpr-dev-plus-aosp am: e68319db

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

Change-Id: I2f16f87372f7a0c3513439222814dc315c4ddebb