[automerger skipped] Merge "Work around GIDs not applied to APK-in-APEX...

[automerger skipped] Merge "Work around GIDs not applied to APK-in-APEX permissions on first boot." into main am: bcf722f0 am: c156ef59 -s ours

am skip reason: Merged-In Ied24c45734e7c57ce8ed0d015121675bfcbae54f with SHA-1 05b75fb4 is already in history

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



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