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

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add "Suggested Devices" section in list" into tm-qpr-dev am: e5bea6a7 am: 3c720bdb -s ours

am skip reason: subject contains skip directive

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



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