Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f7...

Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f7 am: 926a2a40 -s ours" into rvc-qpr-dev-plus-aosp am: 496ee020 -s ours

am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 9da99253 is in history

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

Change-Id: I4df4adf27b866a4111ab6c4d8a63903dd26c39c9