DO NOT MERGE: Downbranch merge conflict [Output Switcher] Update volume control behavior

Update volume control and click area to meet new spec.

Bug: 228606471
Test: verified on device
Change-Id: I3d3155b3ba26ae50d0e5c718eef7e1d2cd2aa52f
4 files changed