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 am: fa7b5ed0 am: e564787c

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



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