Merge "[ActivityManager] Reduce report ANR on wrong activity."