hlte: Break apart tmo/can variants due to NFC differences.

Change-Id: I5b5678085b9906881230803fe1c7425f407e2df1
hlte: add overloaded method for new RIL.

Change-Id: I1581de4b578236a52654b923d11dac02e88b7020

Conflicts:
	ril/telephony/java/com/android/internal/telephony/HlteRIL.java