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

Merge "[automerger skipped] Merge "Check group channels for FGSes" into qt-qpr1-dev am: 347e74fb -s ours am: 35ff8e40 -s ours am: 59a82f90 -s ours am: f02e0c43 -s ours am: ff373ec6 -s ours am: 7a5c00cd -s ours" into sc-v2-dev-plus-aosp am: 7e0e1a2c -s ours

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

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

Change-Id: I5838c4a20551fdbe3fdef1459534823327b65458