resolve merge conflicts of d42d9a41f6 to sc-dev

Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e

tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.vpn2;
 
 import static com.android.settings.vpn2.AppManagementFragment.appHasVpnPermission;
+
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;