Settings: update Privacy Guard help text string

Fix tiny error plus shorten string a bit

Change-Id: I3453d677a5bce8d8f58539d71283d47fe4a4cbf4
Signed-off-by: Ricky Salinas <rsalinas1@mail.usf.edu>
Settings: Integrate Voice+ into Settings (1/2)

Change-Id: I4778443c219cd29a463e9c4dab60783dca251f0f
Signed-off-by: Roman Birg <roman@cyngn.com>
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/WirelessSettings.java