Fix deadlock in AcitivityManagerService. am: 67e05b4d am: 44c9e2f4 am: b4ecfb9d am: 911f86e8 am: 31a4d8fe Change-Id: Iaf8b0b4f605b5969db53756de20789161419cb99