Bug: 220684478 Test: atest -c VpnSettingsTest Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
ccb8855b98
11979785a6