Merge "Increase the number of service supplementary group" into main am:...

Merge "Increase the number of service supplementary group" into main am: 89b4f96d am: 0b3c8ca0 am: 12534709

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727414



Change-Id: Ie9f21b683c67db95427e2a404e5dcf8852d79caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>