Merge "Merge "Avoid MotionEvent no finish raise unnecessary ANR" into...

Merge "Merge "Avoid MotionEvent no finish raise unnecessary ANR" into rvc-qpr-dev am: 99c3a3f6" into rvc-qpr-dev-plus-aosp am: c8f33b15

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

Change-Id: If3b03d1bd415c00bbd2d8c09cdd95897221013e1