Merge changes from topic "ipsec-tramsform-state" into main am: 07e425cd am: 1f94c911

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2833754



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