Fix deadlock in AcitivityManagerService.
am: 67e05b4d28

Change-Id: Ie590be7c82c693691e69a5855602c4ed5499c428