[automerger skipped] Fix output switcher didn't show album art am: c2dd4429...

[automerger skipped] Fix output switcher didn't show album art am: c2dd4429 am: a06d339f -s ours

am skip reason: Change-Id I761d83af8e08a744e4cd5c55ff2c445125885730 with SHA-1 e7930339 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73d89f0b5fcce53d4da759d8c683dfb368edde37