[automerger skipped] Improve IKEv2/IPsec VPN by proposing more IKE algorithms am: cdd8e197 am: c430489d -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: I2902edf892bebe38988109301713c257b81fa8ae