Merge "Fix sound settings affinity"

            android:label="@string/sound_settings"

            android:icon="@drawable/ic_homepage_sound"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

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

                <action android:name="com.android.settings.SOUND_SETTINGS" />