Merge "Fix deadlock in AcitivityManagerService." into nyc-dev