Merge "Remove vendor from android.hardware.cas-service_fuzzer" into main