Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev

    <!-- Name of the setting to disable the automatic update -->

    <string name="ota_disable_automatic_update">Automatic system updates</string>

    <!-- Name of the setting to launch Location Dogfood Tools -->

    <string name="location_dogfood_tools">Location Dogfood Tools</string>

    <!-- Label for category for data usage [CHAR LIMIT=30] -->

    <string name="usage">Usage</string>

        <intent android:action="com.android.settings.action.DEMO_MODE" />

    </PreferenceScreen>

    <!--TODO(b/28251942) Remove before ship -->

    <PreferenceScreen

        android:key="location_dogfood_tools"

        android:title="@string/location_dogfood_tools">

        <intent android:action="com.android.apps.location_dogfood.MAIN" />

    </PreferenceScreen>

    <PreferenceCategory android:key="debug_debugging_category"

            android:title="@string/debug_debugging_category">

    private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";

    private static final String LOCATION_DOGFOOD_TOOLS_KEY = "location_dogfood_tools";

    private static final int RESULT_DEBUG_APP = 1000;

    private static final int RESULT_MOCK_LOCATION_APP = 1001;

    private String mMockLocationApp;

    private Preference mMockLocationAppPref;

    private Preference mLocationDogfoodTools;

    private SwitchPreference mWaitForDebugger;

    private SwitchPreference mVerifyAppsOverUsb;

        mMockLocationAppPref = findPreference(MOCK_LOCATION_APP_KEY);

        mAllPrefs.add(mMockLocationAppPref);

        mLocationDogfoodTools = findPreference(LOCATION_DOGFOOD_TOOLS_KEY);

        mAllPrefs.add(mLocationDogfoodTools);

        mVerifyAppsOverUsb = findAndInitSwitchPref(VERIFY_APPS_OVER_USB_KEY);

        if (!showVerifierSetting()) {

            if (debugDebuggingCategory != null) {