Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558  -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2  -s ours am: b235bc6f09
am: 8fedc773fc

Change-Id: I389e25a4d5bc24761cc7c2c9e94e45e5e6158453