Fix deadlock in AcitivityManagerService. am: 67e05b4d28
am: 44c9e2f4bf

Change-Id: I22ce07b7b273cef869ddcebee029c15316ec9c1c