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

Change-Id: Id2d98d2f695f8884b5854e8fb1fbf406fda8fdb0