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

[automerger skipped] Merge "Check group channels for FGSes" into sc-qpr1-dev am: abba9d6c am: ece031b0 -s ours am: af71a24e -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/+/16600864

Change-Id: I3c8d50586048dd6a0fff44867a57257f5fbb2851