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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05e6b14fca44919610317831c147413b0a431224
tree: 34513b9ddcacad058092cb4f8a1e0181dce3ff9d
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS