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

Change-Id: I1489cbfc74d97cb5e64cc712c480d556e227285e