[automerger skipped] Merge 24Q3 to AOSP main am: c29436825d -s ours am: c74c63154d -s ours

am skip reason: Merged-In Iecb8804965686f8c9a913054c33e93a46c870c94 with SHA-1 66caaf168e is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/3258377

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