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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05e6b14fca44919610317831c147413b0a431224
tree: f8a6205be9d003bc61dcda30a8719a0fdd07b42b
  1. core/
  2. services/