Merge "[automerger skipped] Merge "Check group channels for FGSes" into...

Merge "[automerger skipped] Merge "Check group channels for FGSes" into rvc-dev am: 41a58507 -s ours am: 3c42fd62 -s ours am: f36b3d70 -s ours am: bbabed47 -s ours am: 806ca445 -s ours" into sc-v2-dev-plus-aosp am: 6878f84a -s ours

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

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

Change-Id: I47ca4dd23c139f7c6291fd3e34cbb15bd22338f1