[automerger skipped] DO NOT MERGE: Downbranch merge conflict[Output Switcher]...

[automerger skipped] DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add "Suggested Devices" section in list am: 87e045df am: 63732b1c -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ib8c50a2d62d03cda8d48765ddc8b7c7ad1158a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>