Revert "Merge branch 'LNX.LA.3.5.2.2.1_rb1' of git://codeaurora.org/platform/packages/services/Telephony into cm-11.0"

This reverts commit b0fd901d1db7bc26d6993015fd3a4e9fb8bedddc, reversing
changes made to 2fead5ec09d3ee8033fdefbbac053c32113660ad.

Conflicts:
	common/src/com/android/services/telephony/common/Call.java
	res/values/strings.xml
	src/com/android/phone/BluetoothPhoneService.java
	src/com/android/phone/CallNotifier.java
	src/com/android/phone/NetworkSetting.java