Merge "Add defaults for audio AIDL interfaces" into udc-qpr-dev-plus-aosp