resolve merge conflicts of 2c826d7a to master

        </activity>

        <activity android:name="Settings$AutomaticStorageManagerSettingsActivity"

                  android:exported="@bool/config_has_storage_manager"

                  android:exported="@bool/config_storage_manager_settings_enabled"

                  android:label="@string/automatic_storage_manager_settings"

                  android:taskAffinity="">

            <intent-filter android:priority="1">

    <!-- Whether swipe security option is hidden or not -->

    <bool name="config_hide_swipe_security_option">false</bool>

    <!--Whether the storage manager exists. -->

    <bool name="config_has_storage_manager">false</bool>

    <!--Whether help links are defined. -->

    <bool name="config_has_help">false</bool>

</resources>