[CM Merge]Rild fix for qcom device

Change-Id: I296d2d764c66f021f26a902cb95eb213aa2152b0