Merge changes from topic "cherrypick-fix-anr-input-6mcjse09o2" into tm-mainline-prod am: eaacd902

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

Change-Id: I3c3234b0dfe8b973c1820b3d6901b3d530cdb142