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