Merge "[Output Switcher] Follow up change of output switcher for mertial next" into sc-v2-dev am: 2e995c254d am: 980942f7b6

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

Change-Id: I067d13d5b0e850df57d635220c5fd420f3a56251