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
Change-Id: Ieff347e63bf42a009f60d1d0ba7c8eeb6cda37d7
This commit is contained in: