Merge "Add defaults for audio AIDL interfaces" into aosp-main-future