[automerger skipped] Merge "Check group channels for FGSes" into qt-qpr1-dev...

[automerger skipped] Merge "Check group channels for FGSes" into qt-qpr1-dev am: 347e74fb -s ours am: 35ff8e40 -s ours

am skip reason: Merged-In I9db781c300e96e9c80bd5d21585b8be9b4db08c8 with SHA-1 331b6179 is already in history

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

Change-Id: I07b44d643f399de5326c1bab2f237434583fa8db