[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: 9d07c058 -s ours

am skip reason: skipped by user juliacr

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

Change-Id: I6e9ae6ec8b6c63a318ade7b45168176e3b313c47