Merge "Typo fix in media settings title variable"

        <activity android:name="Settings$MediaControlsSettingsActivity"

                  android:exported="true"

                  android:label="@strings/media_controls_title">

                  android:label="@string/media_controls_title">

            <intent-filter>

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

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