DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am: dce4be63bb

Change-Id: Ia1db0d226d84ed07da6712f554327b49c9fe59c0