HLTE: ril: Update based on Ethan's changes for klte.

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

Change-Id: If543741a85251378fd78178378b1c147b253f74d
(cherry picked from commit a1c419802ec160219e677ebbb1a9c432763a47da)