am b0a57502: (-s ours) am 6ec402b5: DO NOT MERGE: Fix input event injection ANRs on UI thread.

Merge commit 'b0a57502c6f17edd1a63bee1463bc2f9fd78e4a4'

* commit 'b0a57502c6f17edd1a63bee1463bc2f9fd78e4a4':
  DO NOT MERGE: Fix input event injection ANRs on UI thread.