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

[automerger skipped] Merge "Check group channels for FGSes" into rvc-qpr-dev am: 7005df13 -s ours am: a29a2ba4 -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/+/16600889

Change-Id: Ic7f26888eae597875d5c58b5b4d0549eb60beb44