Merge "Remove shaoweishen@ who is no longer on output switcher" into main am:...

Merge "Remove shaoweishen@ who is no longer on output switcher" into main am: 3f1415ee am: 39401c3f

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



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