[automerger skipped] Merge "[DO NOT MERGE] Bring back touch events for double...

[automerger skipped] Merge "[DO NOT MERGE] Bring back touch events for double tap and double tap and hold." into rvc-dev am: e16a6a02 am: af0ce085 am: 232183fa am: a4b50ca3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iefd4794b578a67f283c30194c07dbd1f778ab378