Merge "Remove deprecated IKEv2 methods." am: aacd54a217 am: c792fb0d31

Original change: https://android-review.googlesource.com/c/platform/cts/+/1680767

Change-Id: Icc956f59410ea9a5e20bd7f4cd5b53e340ba9243