Merge "Use phoneId instead of slotId to check presence of sim" into q-keystone-qcom-dev