Merge "ViewGroup: Fix dispatching of generic motion events" into main am:...

Merge "ViewGroup: Fix dispatching of generic motion events" into main am: c48014ff am: a36355c7 am: be2753ae

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



Change-Id: I479deefd023aaafea0d4e5a34988e05982a0c510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>