Merge "ActivityManagerService: Remove some duplication."