Merge "Merge "Implement advanced icon style for output switch" into rvc-dev...

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

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

Change-Id: If9d0c53106ecfb5811e978e70179ca9d5b22f7a9