Merge "DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Adjust properties in dialog" into sc-v2-dev am: db90b4d97a

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

Change-Id: I10a1f2ec33779642beb9536fdead7b7c0a163d2a