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

* commit '5cb6837f288e3f1e0ff8f6f9b571a85ebb34bca7':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.