Revert "HuaweiQualcommRIL: fix for CAF merge"

This reverts commit 8959eeef0b11cad49bb9e28d14e57bc653beb780.