Enhancement for group operation in output switcher am: 3de24ae2c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0acd4e4b65253fe376103ec11b736099c93ab4e6