DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: 2d608378f4  -s ours

Change-Id: Ie6c10a3ef11ea0ec560f20ef49f14f46184d1a4d