Merge "Create vendor-available vold AIDL interface" into main