DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4  -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd  -s ours am: 20bafe850d
am: 923f622c15

Change-Id: I2962af1b07cd8102a471d3e0020e64dc50c94a04