[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 showing the add button" into sc-v2-dev am: 3020be87 am: 38ffecfe -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifcb0508d832b88d3ad7d3b9865c20f2df3cbd529