Merge "Ensure *# are included in TTS spans generated with PhoneNumberUtils." into oc-mr1-dev