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

Change-Id: Ifae0a5532d455931e6f3dd01c2273e6fd21d3f07