Revert "HuaweiQualcommRIL: fix for CAF merge"

This reverts commit 7e15ad955a4bb223546eb701de6777d5adf64478.