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

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



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