Merge "[Output Switcher] Update advanced icon" into tm-dev am: 1b490e12 am:...

Merge "[Output Switcher] Update advanced icon" into tm-dev am: 1b490e12 am: e9db4fab am: 67b7aceb

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



Change-Id: I08fccb6dbfb5f3be6e6f4c956d9d3a0bd13fd45f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>