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

Change-Id: Ibb2cba35ebedc884247c189a214ccce396333342