[automerger skipped] Merge "Move SmsNumberUtils from opt/telephony to...
[automerger skipped] Merge "Move SmsNumberUtils from opt/telephony to base/telephony/common." am: 3848bcfc am: 4ac6475f
am: 5238b030 -s ours
am skip reason: change_id I8313807eed920fd8b2065fa87b6e3141b415a33e with SHA1 b5683632 is in history
Change-Id: Ia6ce58aa5113f11666b1ed62093e660a49d5e23e