Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev...

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee35  -s ours am: 43a1f74d am: e8e30122 am: fcc3d8fc  -s ours am: b235bc6f am: 8fedc773 am: 827f4654 am: 8d302da9  -s ours am: 7efc56cc am: 73d479af am: 564fc8f8
am: 7fff8a7b

Change-Id: I1397b94cb9730b7fc0ad9dadac8fead71b1ec551