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

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

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