Merge "run-as: reduce the scope of changed egid." into main am: 1b86c0dd am:...

Merge "run-as: reduce the scope of changed egid." into main am: 1b86c0dd am: 85094d8d am: 0dd1a03c

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



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