[automerger skipped] Merge "Avoid using Phone object in SmsNumberUtils." am:...
[automerger skipped] Merge "Avoid using Phone object in SmsNumberUtils." am: d4e8368a am: d733fecd
am: b50e6e18 -s ours
am skip reason: change_id I30f7f607961a45d81e00ade1394742ced5245583 with SHA1 1c3f13b5 is in history
Change-Id: Ib0ab00fc76edd62ce7d43cc6e581445ca5ec772a