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

* commit 'b9d7bd60171c88d8057c7a907fa42d140c453845':
  Revert "Revert "Hide sort order and name format prefs for CJK locales""