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
am: e3521a260d  -s ours

Change-Id: I73a5299bb719a43c9e6a2046fb80dd4c25a21032