Forward porting CM10 Advanced Phone Settings

Squash of http://review.cyanogenmod.org/#/c/22186/
and http://review.cyanogenmod.org/#/c/23113/

Change-Id: I3674aa2b4cb6c1386458b8bd95566d43dc8cbedd

Conflicts:
	res/values/strings.xml
	src/com/android/phone/PhoneUtils.java
Clean up in-call vibration implementation.

Change-Id: Ic91e8be169f7ba62ea2dc83dee2215df8a59c915
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_packages_apps_Phone into pa-cm-10.1

Conflicts:
	res/values/strings.xml
	src/com/android/phone/PhoneUtils.java

Change-Id: Ib7365d601ea238f782b8ea7d70a38bdbcf54767a