Snap for 8762906 from 9812f35a1b to tm-qpr1-release

Change-Id: I5f27e372fffbeae23a4833f45724dbaaff56dd04

src/com/android/settings/enterprise/EnterprisePrivacySettings.java

@@ -77,6 +77,10 @@ public class EnterprisePrivacySettings extends DashboardFragment {
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        if (mPrivacySettingsPreference instanceof PrivacySettingsFinancedPreference) {
+            return;
+        }
+
         replaceEnterprisePreferenceScreenTitle(
                 MANAGED_DEVICE_INFO, R.string.enterprise_privacy_settings);
 

src/com/android/settings/network/telephony/RoamingDialogFragment.java

@@ -72,7 +72,9 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.yes, this)
                 .setNegativeButton(android.R.string.no, this);
-        return builder.create();
+        AlertDialog dialog = builder.create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
     }
 
     @Override