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: 509a6a25 -s ours am: aaf35c18 -s ours am: 41f512e1 -s ours am: 9726897c -s ours" into sc-v2-dev-plus-aosp am: c7df1593 -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: Ib5694074209ca947c4b0544b04cdce55c7604112