[automerger skipped] Merge 10952656 am: bf9b89a17e -s ours

am skip reason: Merged-In Ic35032349ac6c8668a5aca48f95b0b9b09fd4931 with SHA-1 c7f972b65d is already in history

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

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