Merge "DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep showing the add button" into sc-v2-dev am: 3020be87

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

Change-Id: Ie1cd288b5ad030d82099b9a5696fdadcd2a94cf8