[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: 4ba967ae am: cd9e59a4 am: 8ac772ad -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iaaf5bbe8e476d304a8cfe84f0fe1e3162671305b