DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036  -s ours am: e44f8fcca4 am: 6b77a4ee55
am: 91ff18a1f6

Change-Id: I06ecd096731967b9ab0ad55ebb3fa12b3cea4247