DO NOT MERGE: Downbranch merge conflict [Output Switcher] fix checkbox
not show

Bug: N/A
Test: Verified on device
Change-Id: Ib505321c98a33cccbe46239431ea86b50a261ab3
1 file changed