Reorder code flow to reduce redundent work. Bug: 213836977 Change-Id: Ie83e41dd2664f0d7828c1e13060e669496c41591 Test: Junit VpnPreferenceControllerTest
Reorder code flow to reduce redundent work. Bug: 213836977 Change-Id: Ie83e41dd2664f0d7828c1e13060e669496c41591 Test: Junit VpnPreferenceControllerTest