Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139  -s ours
am: 011172a731

Change-Id: I67154d381d7e9313a3316550b2a991dc12b2cbde