Merge "Fix telephony persistent voicemail notification" into udc-qpr-dev