[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: c958788d71 -s ours

am skip reason: Merged-In I73773870a490dde6ee8e0672f415c052d16d20fb with SHA-1 318723dc71 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/barbet-sepolicy/+/25973222

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