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

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

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