Chinese Location Lookup [2/2] Telephony: Detect external plugin.

Change-Id: I9ee3f925af09a5689ad7b72a2f1c2e1925fa3433
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

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

Change-Id: Ie0ca2c21628cd12d5068cbb88f2026ba04411196
Revert "Chinese Location Lookup [2/2] Telephony: Detect external plugin."

This reverts commit 252c26234958cb3d0f279508f2e383c30a1873e5.

Conflicts:

	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java

Change-Id: I7c7d09673bd0f1069c1c7b5608d4a284ea8278e6