[automerger skipped] Merge 24Q3 to AOSP main am: c36ea1b66a -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: Ida08f339e0cd78c80e0aa64484c4f2052f5d630b Signed-off-by: Automerger Merge Worker <[email protected]>