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

Change-Id: Ie957e5ca85ad212891574b0a5a932fde4c565ede