[automerger skipped] Check group channels for FGSes am: 331b617949 -s ours am: d21f306f3e -s ours am: a250ac1cf7 -s ours am: 120d0e7ae7 -s ours am: cb3d58b168 -s ours am: 5808787aaa -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I0f17c1d39d7300b1bd3bb23a51685bc07e80f7fb