Merge "fix Telecom out of sync w/ Telephony#defaultVoiceSubId" into tm-qpr-dev