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 am: df97b87f

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



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