[Output Switcher] Align latest code with tm-dev to resolve merge confict

sync code for Output Swithcer with tm-dev branch to resolve downstream
branch merge conflict.

Bug: 233014631
Test: Build pass
Change-Id: I4f8b47921b74dea7a3341a7c86de620b4e79101e
17 files changed