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