DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b
am: 2f44f906a6

Change-Id: I389ab319b133296296f3e7fe6aa44b9f208748bd