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

Change-Id: Iadb9309292857ad016a30c5b19c50114efe64890