Merge "radio: iris: Return proper antenna type for get antenna IOCTL" into msm-3.0