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

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

Change-Id: I8485bc48c0aec20b361d5ab9a83725946494046c