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

Change-Id: I5f544bbba63ff7176db49b689cfa1794a512767b