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: 4ba967ae

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

Change-Id: I6017d991c3048c30259e98bdab81b0b22612542c