Fix the hyphen in "Wi-Fi" to use an actual hyphen instead

If one were to change the system font to something else, the hyphen in "Wi-Fi" would appear as a box since it can't find the character. This fixes it and uses actual hyphens so they will appear properly when the system font is changed.

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
(cherry picked from commit c48113ca504fc0c7ebed1595d2470ee073454cf6)
Settings: fix custom SIM name lost on reboot

NAME_SOURCE_USER_INPUT should be set or the value won't
be saved in the database

Change-Id: I007eba76af5cb5a37988413a0d551eab60a9d4ca
(cherry picked from commit cd04c2a188f04cd36d3ad4368cb0d754eadc9705)