Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49
am: 94da8023d5

Change-Id: Iedc174184adc89009ce498558a496b72d1c31a05