Merge "Update language to comply with Android's inclusive language guidance"

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

@@ -189,7 +189,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
             getPreferenceScreen().removeAll();
             return;
         }
-        // Set up master switch
+        // Set up primary switch
         mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
         mSwitchBarController = new DevelopmentSwitchBarController(
                 this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,