[automerger skipped] Merge "Check group channels for FGSes" into sc-dev am: 90c72d1ea8 -s ours

am skip reason: Merged-In I9db781c300e96e9c80bd5d21585b8be9b4db08c8 with SHA-1 2934bf6a70 is already in history

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

Change-Id: I8725206f67f02f2a37e41a03092ee5dbf2637758