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: I04a965ac97f38a7f050b4810767165de8d21e347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>