Merge "FR61513: Hide Use SIM in Single SIM for HAL 1.4" into r-keystone-qcom-dev