[automerger skipped] Merge 24Q4 into AOSP main am: 2a5bcd59d6 -s ours

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

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

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