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

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

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

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

Change-Id: I7752bde0d7478205f36b65e89e2981253dd06508