am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService."

* commit '07bb03c42343d54d0a8eb609c74eebd9ecd0df9d':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.