Merge "Start apex-system-services in SystemServer."