[automerger skipped] Merge "Correctly handle null ProxyInfo in...

[automerger skipped] Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" into tm-qpr-dev am: 27c36806 -s ours am: 310dca83 -s ours

am skip reason: Merged-In I67ee2aa5c96dc22ba8fcd2be3fd4c090dec20697 with SHA-1 29348dbf is already in history

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



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