Merge "[FUI04] Refactor VpnInfo" am: 561626b20d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59054bfe1761e28cdfb8e8e6d67e4aabda399adc
tree: e2de1a25551b0d1e5de795613404db0c72bf790d
  1. core/
  2. services/