[automerger skipped] Backport more public types to 202504 am: 9716b2eafe am: 4f088565ca -s ours

am skip reason: Merged-In I1c86544fadf938799038a31a652c015c320655d8 with SHA-1 da5810ea25 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/3502890

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