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

Change-Id: Ic9c96ac3d030ebb0ac53a48686b541a0182795cb