Revert "Revert "HuaweiQualcommRIL: fix for CAF merge""

This reverts commit 85763732163d153ce1ec2d2371419ae2f04071be.