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

Change-Id: Ic0bbf06e495f67ce50955e8db8d853852b5b8f0e