Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
tree: ab10122c55702f21feda91c855147db1c1877b35
  1. core/
  2. services/