[automerger skipped] Merge "Check group channels for FGSes" into sc-qpr1-dev...

[automerger skipped] Merge "Check group channels for FGSes" into sc-qpr1-dev am: abba9d6c -s ours am: 008a1abe -s ours

am skip reason: Merged-In I9db781c300e96e9c80bd5d21585b8be9b4db08c8 with SHA-1 539eaff7 is already in history

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

Change-Id: Ib1bee4c2fe9a44458af8e110c5733cde71beb5b4