Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev
am: b358ee3558  -s ours

Change-Id: Idf726fba98ec0e78135498248d111d8571324657