[automerger skipped] Improve IKEv2/IPsec VPN by proposing more IKE algorithms...

[automerger skipped] Improve IKEv2/IPsec VPN by proposing more IKE algorithms am: cdd8e197 am: c430489d -s ours am: 3b0d27eb -s ours

am skip reason: Merged-In Id0983d4b73691b153ee0f1cf3bf63b215098a29a with SHA-1 cdd8e197 is already in history

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

Change-Id: I42633205923a81dfdb3f9b74d4a97941eaf945d7