Fix deadlock in AcitivityManagerService.
am: 67e05b4d28

Change-Id: I3dd3a1eb43bb3da17ff13a41c1b847b51f6701d6