Bug: 233559781 Test: manually test Change-Id: I175ab126ff92f773ab25a1fa64e4262b324fd353
Bug: 220684478 Test: atest -c VpnSettingsTest Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b