DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9e am: 5c53e1b8 am: 271aa240 -s ours am: e44f8fcc Change-Id: I8c985dee46cceb5ad8cf3beb6ac9839d9a9d2058