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

Change-Id: I8a3eb8c29b34e74bad807485767bf4e2083c539d