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

[automerger skipped] Merge "ViewGroup: Fix dispatching of generic motion events" into udc-qpr-dev am: 1b2f7051 am: 2dfed769 -s ours

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

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



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