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

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



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