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

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

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

Change-Id: Iaf1ed6983ee67ee4432a167b23b7ea4cd05196bd