am 4e88ecf4: am 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"

* commit '4e88ecf4bc344557af31eb367e6e01b2d5b60471':
  [ActivityManager] Reduce report wrong anr activity