[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: 0bd0a375 am: 2ca63cb9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I91c606671cbe6f4d0bbbcf722eddd7e1c606cf5d