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

Change-Id: I905ac1ec9d8f9244b2ff614e7b00c6a6eea7760c