Merge "[ActivityManager] Prevent kill a restarted process again."