DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416
am: 6f170618ff  -s ours

Change-Id: I862c56f9db4ac9161dc155dc9f469909e30b0c61