Merge "Check group channels for FGSes" into sc-dev am: 90c72d1ea8

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

Change-Id: Id803d92b5f83b906e35ec2cacea327708265924c