Merge "gpuservice: Add GPU Vendor ID support to FeatureConfig proto" into main