Merge "Merge "Merge "[Output Switcher] Not using advanced icon for bt device"...

Merge "Merge "Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea62 am: 894dbdf9" into tm-d1-dev-plus-aosp am: 09878987" into tm-qpr-dev-plus-aosp am: 83f9ac2d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309447



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