msm8960-common: ril: Avoid collision with RIL constant 1138

 used in some Samsung devices for RIL_UNSOL_TETHERED_MODE_STATE_CHANGED.

 Thanks to iptux on XDA for pointing out the change in constants between
 CM-10.2 and CM-11.0.

 This patch is complimentary to:
 http://review.cyanogenmod.org/#/c/61289/

Conflicts:
	libril/telephony/ril.h

Change-Id: Id15503a04bb469c5aa8d211a00654fe6008340e4
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0