Merge "[FUI03] No-op refactoring of VpnInfo" am: c1140f2a33 am: 2b6868d243

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
tree: 9fb83a58d66b17547ec01b479705df2673cf0b89
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS