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

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



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