Revert "hardware: ril: Avoid collision with RIL constant 1138"

Later Qualcomm RILs will use the STK_CC_ALPHA_NOTIFY message, and this
causes the radio to parse the parcel in a very incorrect manner.

This patch is complimentary with
http://review.cyanogenmod.org/#/c/75148/

This reverts commit ab552db30f9daae330d01c899ef242b84cd6b83f.

Change-Id: I2adec6d8fc9db91c1fd486925fdc3aedc9285a2b
Merge remote-tracking branch 'cm/cm-11.0' into HEAD