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

sync code for settingslib/media with tm-dev branch to resolve downstream
branch merge conflict.

Bug: 233014631
Test: N/A
Change-Id: Ib8c4446f88aeba3e9534dc612cbdffe0a48f2310
1 file changed