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

Merge "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" into nyc-mr1-dev-plus-aosp
am: 9439a3a5  -s ours

Change-Id: I01d943ac5d8f5185cb81ec77546368e0300d3511