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

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



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