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

Change-Id: Ia7ea774c55524f67b9174bad90cb85bac034b246