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

Change-Id: Ibca806635a91bda6e7577de3dc1e9a71fa9c4dc6