[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e -s ours am: b07add8ebc -s ours

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

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

Change-Id: Ie5b037df1d53019c773ecebf7db9d38dd9dd8df0