Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib."