[automerger skipped] Merge "ViewGroup: Fix dispatching of generic motion...

[automerger skipped] Merge "ViewGroup: Fix dispatching of generic motion events" into main am: c48014ff am: a36355c7 am: be2753ae am: 2d9371c0 -s ours am: b0e1b6ed -s ours

am skip reason: Merged-In I886a2594a091e5d1870e564b67d46ce5e4901ae5 with SHA-1 a7adeb7c is already in history

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



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