Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19 am: a50c41b050

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

Change-Id: I600dc5f51430b2702cbb13af066e458e190561fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>