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

[automerger skipped] Merge "Check group channels for FGSes" into sc-v2-dev am: a70be492 am: aa774869 -s ours

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

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

Change-Id: Ifa417692a855526a284ac1d676a894adb64481c8