[automerger skipped] Merge "Check group channels for FGSes" into rvc-dev am: 41a585070d -s ours am: 509a6a25a1 -s ours am: aaf35c1877 -s ours am: 41f512e111 -s ours

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

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

Change-Id: I18e4b5df6036deae5b81b082b9510dbe07fa8da2