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: 727289b3 am: 2f397365

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



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