Merge remote-tracking branch 'Cm/cm-11.0' into kitkat
SIMRecords: If there's no EF_SPN record, fallback to EF_PNN

Turns out some SIM (TMobile US, at least) don't fill in the SPN, but
do insert a PNN record for home network (which in the case of a non-MVNO
are the same. a MVNO should always have the SPN filled anyway).

Change-Id: I18388bb071a49698015c76abefb58798f800946c
Telephony: Scrub debug messages for identifiable information.

Change-Id: I70fd8d9b4900dc9e070be24e7efa8d3458caef99
Merge remote-tracking branch 'cm/cm-11.0' into kitkat

Signed-off-by: anerikg <anerikgames@gmail.com>

Conflicts:
	src/java/com/android/internal/telephony/util/BlacklistUtils.java