Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev