Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274 am: 96d70301 am: 018d1e7e Change-Id: Ide3eaf333a2a1e3ef60ec0fb6e9ead1a0517c327