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