Merge "Fix Ikev2 vpn cannot establish through startLegacyVpn()" into sc-dev am: 30d17bd9 am: 558a160f am: a6de2ae4

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

Change-Id: I819172bc14783a4e0734719d89ea4a86cbc751ef