[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: 8143b818 -s ours am: 95a3603a -s ours am: eabf9552 -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I6569acdca7d8f207a979d0060cbb5cd32902338b