Merge "Fix incorrect gid config leads to process/system cannot start." into main am: b19525912f

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

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