Merge "[automerger skipped] Check group channels for FGSes am: 331b6179 -s...

Merge "[automerger skipped] Check group channels for FGSes am: 331b6179 -s ours am: d21f306f -s ours am: a250ac1c -s ours am: 120d0e7a -s ours am: cb3d58b1 -s ours am: 8143b818 -s ours am: dd7601c9 -s ours" into sc-v2-dev-plus-aosp am: 6c388da6 -s ours

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

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

Change-Id: Ic7dd2f82273be3f09044b40d1bb4bb201ace019b