tree 4e3d97df3acd429e3f072e3ebf1f27035fa5785e
parent c76e18929d2d1c40eecc055e507ecdd3f73dad33
author shaoweishen <shaoweishen@google.com> 1652839412 +0000
committer Shaowei Shen <shaoweishen@google.com> 1653039731 +0000

[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