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

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

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