Merge "[Output Switcher] Add group title" into tm-qpr-dev am: b379d5c3 am: 8cc6d31d

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



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