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

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



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