Merge "[FUI04] Refactor VpnInfo" am: 561626b20d am: 0824b59f74 am: 9e10a5a1ef

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfa9918e41fc3f952a23956108df4db449741364