Merge remote-tracking branch 'PA/kitkat' into remix-staging

Conflicts:
	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java
Revert "[2/3] Telephony: allow disabling non intrusive incall ui"

This reverts commit 71f02274f722cd78cc9313c3184e5f160a767290.

Conflicts:
	res/values/pa_strings.xml
	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java