Fix 4.4.3 merge

Change-Id: I677df1d0b5856d5f844466a158613412275b2adf
Revert "Telephony: Open source google dialer and more (3/5)"

This reverts commit 166c01625b1a933e566b68b85abae06c026cd1be.

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java

Change-Id: Id12b97d9b8dab4f80b2410e7bb5405a5390a0f81
Revert "Revert "[2/4] Dialer lookup""

This reverts commit 4a5f6a2b06d72195eaacd6fc728ee058152aba1b.

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

Change-Id: Ic5ef66b30e7a0b4959b415b435805debd4e888e7