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

Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f7 -s ours am: b07add8e -s ours" into rvc-qpr-dev-plus-aosp am: e7ccdf2a -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: I4e4ebec9b206d6511e3c82796d1d31e0fb79ec9c