am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

* commit '3fb2b7132b64c65163e7c6cd948e45f703e93687':
  [ActivityManager] Reduce report ANR on wrong activity.