DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb
am: 271aa24036  -s ours

Change-Id: Icaccd5612147cad9679f98476cf92bb3216e94f1