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

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

Change-Id: If0eafb434e3226a2cf2727fdd7111b7b582e6fa3