Merge "Resolve the endpoint in legacy VPN" am: f54a70cdcd

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

Change-Id: I732bb2282cf5b4ba74653ecc0bd934bf991649de
tree: 472f5aebe723128d4d4bfe1e03da6a442b756cc4
  1. core/
  2. services/
  3. tests/