DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5
am: 5c53e1b8bb

Change-Id: Icd67597290378b8b62328cbfafa35fd0fc0497b6