Merge changes from topic "presubmit-am-86e91cffbb564d20a27cb55011174a08" into sc-v2-dev-plus-aosp

* changes:
  [automerge] DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep the check for single device of add button 2p: f957ea7413
  DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep the check for single device of add button