Merge branch 'kk_3.5_rb1.19' of git://codeaurora.org/platform/hardware/ril into cm-11.0-qcril

Change-Id: I0995b3b4c15cd597de89cad21941a950b9e94793

Conflicts:
	include/telephony/ril.h
	libril/ril.cpp