Merge "Ensure *# are included in TTS spans generated with PhoneNumberUtils." into oc-mr1-dev am: e3cf5cda13
am: 60c202e27b

Change-Id: Ie9ce490397eec47ccf5b0b9ba436fb696b2188fe