am cb0af4f1: Merge "Improve watchdog monitor for InputReader and InputDispatcher."

* commit 'cb0af4f1b0709b236a030f41c75edd97cf0bf1fd':
  Improve watchdog monitor for InputReader and InputDispatcher.