DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff  -s ours am: 7f99a18e0e am: 1701a25584
am: bac21c0a99

Change-Id: I13dd3f85735873d86b2c196d8280740c9289fc51