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

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



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