Merge remote-tracking branch 'caf/LA.BR.1.2.3_1' into caf/cm-12.1

Conflicts:
	src/java/com/android/internal/telephony/InboundSmsHandler.java
	src/java/com/android/internal/telephony/ModemBindingPolicyHandler.java
	src/java/com/android/internal/telephony/PhoneBase.java
	src/java/com/android/internal/telephony/PhoneFactory.java
	src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
	src/java/com/android/internal/telephony/SubscriptionController.java
	src/java/com/android/internal/telephony/cdma/CDMAPhone.java
	src/java/com/android/internal/telephony/gsm/GSMPhone.java
	src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
	src/java/com/android/internal/telephony/util/BlacklistUtils.java

Change-Id: Ic9b874cabde215c296eca27238f1aa041bde32cc