DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036  -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 am: 2a2c463a01  -s ours am: 9d3efc7882
am: 573c6a4c8d

Change-Id: I3189ccc2da14c4a5c326b9af958103b44c528108