[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: 97ef77e4 -s ours am: 62c00185 -s ours am: 60c77662 -s ours am: f18956bf -s ours

am skip reason: skipped by user juliacr

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

Change-Id: Ibc9d97803bcdf946318e79882596d1b2a50f260f