Merge "Clean up flag ipsec_transform_state" into main am: 6221ee33 am: 39222ae5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3311758



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