Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0
am: 96d70301e6

Change-Id: I9ec98a60d61bbafd25be9d85f31b3086cef59779