Merge "Revert "Revert "Hide sort order and name format prefs for CJK locales""" into ub-contactsdialer-b-dev