RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings

Bug: 220684478
Test: atest -c VpnSettingsTest

Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
10 files changed