Merge "Increase the number of service supplementary group" into main am: 89b4f96d50 am: 0b3c8ca0b2 am: 12534709d7 am: fa7b5ed0e8

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

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