Merge "Provide defaults for android.hardware.audio@6.0-impl" am: 3f5116a1f6 am: 5912212c62

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1366502

Change-Id: Ib211fdb5c61f6ad1893561d9bd6d86bff0b28178