Merge "DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep the check for single device of add button" into sc-v2-dev am: 67f0700f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16819998

Change-Id: I85558839f92fcd7a0391c158484cd2913311406e