am b2a85b69: Merge "Fix blocked event handling in InputDispatcher. Bug: 5161854"

* commit 'b2a85b69ce98a312c450849dfd18bd1f878b5d66':
  Fix blocked event handling in InputDispatcher. Bug: 5161854