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

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



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