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

Change-Id: I1802be47585e42ecf7d09e6b523ae6ef1f6b0556