[automerger skipped] Resolve the endpoint in legacy VPN am: 75d9e28a07 -s ours

am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 678245fef4 is in history

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

Change-Id: If767dc2c9fd68e0a6610a42319f2a61d7fb60c1f
tree: d15e178a6690a7b8cb2d57e1f01b269ea2cb9bab
  1. core/
  2. services/
  3. tests/