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

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

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