Merge "Propagate clientAttribution to CameraService::BasicClient" into main