Merge "libaudiohal@aidl: fix drain as per HIDL" into main