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

[automerger skipped] Merge "Check group channels for FGSes" into rvc-dev am: 41a58507 -s ours am: 509a6a25 -s ours am: aaf35c18 -s ours

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

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

Change-Id: Icbe5ce3e36fd3c0d0d9310d693fe38b01a1ad9dd