Merge "Apply round corner to the album icon in output switcher panel" into...

Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa am: a49b69e5 am: c679982b am: 40b1ae5d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I51a6cbd480c55bcd5e5a0a04fe110dbc15dfb589