[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: e806c95663 -s ours

am skip reason: Merged-In If13b6d231ba06bab6432eeb3aefb78f4f7d384a3 with SHA-1 e8e0c840a9 is already in history

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

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