Merge "Resolve the endpoint in legacy VPN" am: 429b59c8a4 am: fc546021bb

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

Change-Id: If649ab2763c9971c25af7732b32e97bfd50fb6f0