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
am: 827f465492

Change-Id: I6113993dcd1aed053e5755deca2b115f5df8c5bd