Merge "audio: Adjust after "bus" device type change" into main am: a0df7311...

Merge "audio: Adjust after "bus" device type change" into main am: a0df7311 am: c9ba9877 am: 5e3bc609

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



Change-Id: Id70185f8e4670e61c73fb02218637feba7621ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>