Merge "Fix broken settings intent CTS test" into udc-dev

                <action android:name="android.settings.SYNC_SETTINGS" />

                <category android:name="android.intent.category.BROWSABLE" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="package" />

            </intent-filter>

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

                <action android:name="android.settings.CREDENTIAL_PROVIDER" />