Merge "Move TelephonyUtils to base/telephony"