[automerger skipped] Merge "DO NOT MERGE: Downbranch don't need this...

[automerger skipped] 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 am: 498b1281 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie19ce0441d00a655782e714ac81dbea6bd56e879