[automerger skipped] Check group channels for FGSes am: 331b617949 -s ours am: d21f306f3e -s ours

am skip reason: skipped by user juliacr

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

Change-Id: Ib98aa8fe63bacea3dad30b7c6a89c6a0a4cc1ae1