Fix deadlock in AcitivityManagerService. am: 67e05b4d28
am: 433a36e9df

Change-Id: I1ec79a8382d987f6909237ba0fb13dfbd32eb565