[automerger skipped] Check group channels for FGSes am: 331b6179 -s ours am:...

[automerger skipped] Check group channels for FGSes am: 331b6179 -s ours am: d21f306f -s ours am: a250ac1c -s ours am: 120d0e7a -s ours am: cb3d58b1 -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I80a8c645ddb4267c3fb073ae393f8de8ba7bbbd1