Merge "Implement advanced icon style for output switch" into rvc-dev am: 202425a4 am: f941cc44 am: ccbafd97

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

Change-Id: I33733135e402136855df18576385351ab807aee4