Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev