[automerger skipped] Fix nuisance report matching for invalid phone numbers. am: 4ed937994f am: 35503bccc0
am: 13c2ca4f7b -s ours
am skip reason: change_id Ia9b2f9ef8159398f0307b3ad04e0a2c532823fda with SHA1 1d7bcde4dc is in history

Change-Id: Ia2a3a1171a24e50622d61684cbf75346ce83072a