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

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



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