Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe616 am: b0989fd2 am:...

Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe616 am: b0989fd2 am: 046ebf41 am: f5c35bcf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88282c3bb678e157c87fccd1318529ecb62e2820