Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea62

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



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