Merge "shamp: Create soong config variable for vendors" into main