Remove stats about phone entry if not installed
Settings: Integrate Voice+ option into Settings

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

Conflicts:
	res/values/cm_strings.xml
Settings: Remove V+ pref if V+ isn't present

Change-Id: Ia202d00ebee95e99018e7b04ef284de0bf3f1e1c

Conflicts:
	src/com/android/settings/WirelessSettings.java