Merge "Migrate IPsec modules to use state machine lib" am: 4e23d56de4 am: 83a970d901 am: 8f3046ec5e

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

Change-Id: I5d314040f880f3af3604bf9bbde0fe02a15a7f50