[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] Adjust properties in dialog" into sc-v2-dev am: db90b4d9 am: fc9e5611 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0cf891dbd33c00420041a5e994b23840adde299e