resolve merge conflicts of 6446d2f to master

Change-Id: Ibf37d7fed8f8fbb32a601944f504494101c21a3e

src/com/android/settings/vpn2/VpnSettings.java

@@ -170,6 +170,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
     public void onResume() {
         super.onResume();
 
+        mUnavailable = mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN);
         if (mUnavailable) {
             // Show a message to explain that VPN settings have been disabled
             if (!isUiRestrictedByOnlyAdmin()) {
@@ -178,6 +179,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
             getPreferenceScreen().removeAll();
             return;
         } else {
+            setEmptyView(getEmptyTextView());
             getEmptyTextView().setText(R.string.vpn_no_vpns_added);
         }