Merge "Resolve the endpoint in legacy VPN" am: c0f31b35d0 am: 0317f66f27

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

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