Merge "Merge "Implement advanced icon style for output switch" into rvc-dev am: 202425a4" into rvc-dev-plus-aosp am: 49ebce6c am: 880bed51

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

Change-Id: Icdb92aaa2b49a8501b79abdd21288ed96036a68e