Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService."