DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4  -s ours am: bab9c1006a
am: e85152c2fc

Change-Id: Iff935eccf136c6c85b2373cfd113e9f6d6d9c9fc