Merge "Use phoneId instead of subId for the C_IWLAN exit notification" into t-keystone-qcom-dev