Merge "[FUI04] Refactor VpnInfo" am: 561626b20d am: e990043676 am: 0b615b87e7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfa9918e41fc3f952a23956108df4db449741364
tree: 371db1791521f83e9b7a48c1ecd0e4731b5d02bf
  1. core/
  2. services/