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

Change-Id: I52277ddde0b68b3be1764f325d04601e48a1cb1e