Settings: Integrate Voice+ into Settings (1/2)

Change-Id: I4778443c219cd29a463e9c4dab60783dca251f0f
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge "Settings: Integrate Voice+ into Settings (1/2)" into cm-11.0
Settings: Set untranslatable

Change-Id: If8fbcd00ba9cbe0b19cb090874db4f2022505696
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_packages_apps_Settings into cm-11.0