[automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 4ec9a680cc -s ours am: 80f8bbf034 -s ours

am skip reason: Merged-In I95691e1764a7c6fc5a9c9a47ff12d60268bfdd1e with SHA-1 335e3543c5 is already in history

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

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