[automerger skipped] Merge "Check group channels for FGSes" into sc-dev am:...

[automerger skipped] Merge "Check group channels for FGSes" into sc-dev am: 90c72d1e am: e5aa169d -s ours

am skip reason: Merged-In I9db781c300e96e9c80bd5d21585b8be9b4db08c8 with SHA-1 539eaff7 is already in history

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

Change-Id: I058523cf044e9e343013fb53897e6c2be9fd2882