[automerger skipped] Enhancement for group operation in output switcher am: 3de24ae2 am: cda6f5f3 -s ours

am skip reason: Change-Id If74bf2efb89a8ece61f4e0cf13e4dcfa30cb0a8a with SHA-1 2e7a02a0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I641ca8802ec9dfcfa259921df9babf52e5b31da9