Merge "Avoid MotionEvent no finish raise unnecessary ANR" am: 0749905967 am: 036d89cd7d am: aa5360b66e

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

Change-Id: I9d65c7889650df64f1cf122cfa9f6ba38dc4acbb