Merge "Resolve the endpoint in legacy VPN" am: f54a70cdcd am: 616cc3dca9 am: 3285d0fca0

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

Change-Id: I96691f6091c43377f23a00621242ed034fcb0444
tree: eb3649cfc553edb733b7ae37c8efa26a864191cf
  1. core/
  2. services/
  3. tests/