DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4  -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd  -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835  -s ours am: eacf98bf52 am: 680b4dd14e am: df54f99587
am: 8fa0ab1486

Change-Id: Ifcbd293bfa76fddac42a104ab4844d38b66323cd