[automerger skipped] Merge "Check group channels for FGSes" into rvc-dev am: 41a585070d -s ours am: 3c42fd6270 -s ours am: f36b3d7044 -s ours

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

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

Change-Id: Ib9abdc8f64feb2dbb03cc329e49d09795de31517