Contacts:The "Settings" button should display in Chinese mode

In Chinese mode,the parameters "config_sort_order_user_changeable"
and "config_display_order_user_changeable" set false,this causes
"Settings" button disappear.

In Chinese mode,set "config_sort_order_user_changeable" and
"config_display_order_user_changeable" to true.

CRs-Fixed: 521577

Change-Id: I52095e5fe7f9cb155e96fbf6a1d0d2b50649bc7d
Contacts: Menu bar is missing after erasing data

When provider status is not normal, the menu bar is hide. After it
returns to normal again for the first time, the option menu is not
invalidated for it is not changed. So menu bar is still hided.

Invalidate the menu when the provider status is normal.

CRs-Fixed: 510812

Change-Id: I4ebb6397e29d2cdb090886f1ca71d635ffa42ff1
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Contacts into cm-10.2