Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add "Suggested...

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

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



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