Merge "Fix HIDL VHAL descriptor name in VTS." into main