Fix Operator && Numeric

Conflicts:
	src/java/com/android/internal/telephony/HTCQualcommRIL.java
	src/java/com/android/internal/telephony/SamsungCDMAv6RIL.java
	src/java/com/android/internal/telephony/SamsungExynos3RIL.java
	src/java/com/android/internal/telephony/SamsungExynos4RIL.java
	src/java/com/android/internal/telephony/SamsungQualcommRIL.java
	src/java/com/android/internal/telephony/SemcQualcomm7x30RIL.java
	src/java/com/android/internal/telephony/SonyQualcomm8x60RIL.java
	src/java/com/android/internal/telephony/uicc/RuimRecords.java
Telephony: fix build error
CDMA: Data connection bug fixes (2/4)

Conflicts:
	src/java/com/android/internal/telephony/PhoneFactory.java
telephony: fix typo