Merge "[ActivityManager] Reduce report wrong anr activity"