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

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

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