am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and...
am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." automerge: 5cb6837f
automerge: a96b61d9
* commit 'a96b61d9':
Avoid deadlock between ActivityManagerService and ProcessStatsService.