DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63 am: a437e7f3 am: c1b2e6db -s ours am: ff9a8d74 -s ours Change-Id: I14d6109858bcf02b5f55eb3e207d6bc1918e746a