opt_telephony: merged CM-10.1 commits up to July 01, 2013

Conflicts:
	src/java/com/android/internal/telephony/HTCQualcommRIL.java
	src/java/com/android/internal/telephony/SamsungQualcommM3RIL.java
	src/java/com/android/internal/telephony/SamsungQualcommRIL.java

Change-Id: I54d5b6bf08c69a3c803a2c85b6b208be3f897d89
frameworks_opt_telephony: Fixed prior derped merge

Change-Id: Ide3997b6a130aa83a0e6fd7a2353da524cd13322