am 2e5f8eaa: am ffb49774: Improve ANR diagnostics.

* commit '2e5f8eaa7dbb43e5a46eda7a3d1d895f7584a122':
  Improve ANR diagnostics.