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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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