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

Change-Id: I10b7e25858e63110a63b4e92742c1305f0e9eed0