Merge "Adjust after "bus" device type change" into main am: 6e635c96

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2858085



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