[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 91a342287e -s ours am skip reason: Merged-In Ic36ce4ad239f30069c6c63cde1359b25c03ef038 with SHA-1 28e71c5810 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/IPsec/+/3258381 Change-Id: Ibdfe7fe34ffa6164e46c6f6366dd8220485e1e28 Signed-off-by: Automerger Merge Worker <[email protected]>