[automerger skipped] Merge "Fix pixel buds icon is empty in output switcher"...

[automerger skipped] Merge "Fix pixel buds icon is empty in output switcher" into rvc-qpr-dev am: 31534b74 am: 792df3a3 -s ours

am skip reason: Change-Id Ic5c348900db3e79e669173ec4ceeaec4d6500e5f with SHA-1 b4603fd3 is in history

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

Change-Id: Id93994170638e09e3f7e97cd58075d22afd2956c