[automerger skipped] [automerge] DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep the check for single device of add button 2p: f957ea74 am: 81f773cd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iee16e38ff198fffaad53bcb8f4fc7650e881382a