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

Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea62 am: 4d48cced am: 5aec35e0 am: 154ce4c7

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



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