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

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

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



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