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

Change-Id: I861ed40fa031d4add94e48b2fbbfb965ef1ca7d2