Merge "[DO NOT MERGE] Bring back touch events for double tap and double tap...

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

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

Change-Id: I42412f9b1600633978815f0f65e6f8b419e49058