Merge "IMS: Remove TIR mode extra key in IMS call after SRVCC" into r-keystone-qcom-dev