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

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



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