Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev

    <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app -->

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

    <!-- Enable the RingtonePickerActivity in 'com.android.providers.media'. -->

    <bool name="config_defaultRingtonePickerEnabled">true</bool>

</resources>